merge emacs-23
authorKenichi Handa <handa@m17n.org>
Sat, 28 Aug 2010 11:26:20 +0000 (20:26 +0900)
committerKenichi Handa <handa@m17n.org>
Sat, 28 Aug 2010 11:26:20 +0000 (20:26 +0900)

Trivial merge